From eca9dde15fad1dd0bd77f20b40e71a73fd1a4a65 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Tue, 16 Jul 2019 11:58:06 +0100 Subject: [PATCH] Refresh patch series and drop applied patches --- debian/patches/reftest-known-fail.patch | 6 +-- ...to-installed-tests-in-.test-metadata.patch | 54 ------------------- debian/patches/series | 3 -- ...essibility-dump-executable-alongside.patch | 24 --------- ...led-test-metadata-consistent-with-te.patch | 27 ---------- 5 files changed, 3 insertions(+), 111 deletions(-) delete mode 100644 debian/patches/reftests-Fix-path-to-installed-tests-in-.test-metadata.patch delete mode 100644 debian/patches/testsuite-Install-accessibility-dump-executable-alongside.patch delete mode 100644 debian/patches/testsuite-Make-installed-test-metadata-consistent-with-te.patch diff --git a/debian/patches/reftest-known-fail.patch b/debian/patches/reftest-known-fail.patch index 33295738f5..1198141280 100644 --- a/debian/patches/reftest-known-fail.patch +++ b/debian/patches/reftest-known-fail.patch @@ -8,10 +8,10 @@ Forwarded: no 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/testsuite/reftests/gtk-reftest.c b/testsuite/reftests/gtk-reftest.c -index 3a4792e..b6f3738 100644 +index b0fb574..8eab767 100644 --- a/testsuite/reftests/gtk-reftest.c +++ b/testsuite/reftests/gtk-reftest.c -@@ -250,6 +250,20 @@ save_image (cairo_surface_t *surface, +@@ -264,6 +264,20 @@ save_image (cairo_surface_t *surface, g_free (filename); } @@ -32,7 +32,7 @@ index 3a4792e..b6f3738 100644 static void test_ui_file (GFile *file) { -@@ -282,7 +296,13 @@ test_ui_file (GFile *file) +@@ -296,7 +310,13 @@ test_ui_file (GFile *file) if (diff_image) { save_image (diff_image, ui_file, ".diff.png"); diff --git a/debian/patches/reftests-Fix-path-to-installed-tests-in-.test-metadata.patch b/debian/patches/reftests-Fix-path-to-installed-tests-in-.test-metadata.patch deleted file mode 100644 index ed65c9f1dd..0000000000 --- a/debian/patches/reftests-Fix-path-to-installed-tests-in-.test-metadata.patch +++ /dev/null @@ -1,54 +0,0 @@ -From: Simon McVittie -Date: Fri, 14 Sep 2018 09:22:15 +0100 -Subject: reftests: Fix path to installed-tests in .test metadata - -Signed-off-by: Simon McVittie -Forwarded: GNOME/gtk!348 -Applied-upstream: 3.94.1, commit:d19cba429d5fc5ca316fa71d2ab3e5a9d0d86ba3 ---- - testsuite/reftests/reftests-dark.test.in | 2 +- - testsuite/reftests/reftests-hc.test.in | 2 +- - testsuite/reftests/reftests-hci.test.in | 2 +- - testsuite/reftests/reftests.test.in | 2 +- - 4 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/testsuite/reftests/reftests-dark.test.in b/testsuite/reftests/reftests-dark.test.in -index 9ff9e21..ab0e2fb 100644 ---- a/testsuite/reftests/reftests-dark.test.in -+++ b/testsuite/reftests/reftests-dark.test.in -@@ -1,4 +1,4 @@ - [Test] --Exec=/bin/sh -c "env GTK_THEME=Adwaita:dark G_ENABLE_DIAGNOSTIC=0 @libexecdir@/installed-tests/gtk+/gtk-reftest -k --verbose --tap --output $(pwd) --directory @libexecdir@/installed-tests/gtk+/reftests" -+Exec=/bin/sh -c "env GTK_THEME=Adwaita:dark G_ENABLE_DIAGNOSTIC=0 @libexecdir@/installed-tests/gtk-4.0/gtk-reftest -k --verbose --tap --output $(pwd) --directory @libexecdir@/installed-tests/gtk-4.0/reftests" - Type=session-exclusive - Output=TAP -diff --git a/testsuite/reftests/reftests-hc.test.in b/testsuite/reftests/reftests-hc.test.in -index ea3ae9e..9d6cb56 100644 ---- a/testsuite/reftests/reftests-hc.test.in -+++ b/testsuite/reftests/reftests-hc.test.in -@@ -1,4 +1,4 @@ - [Test] --Exec=/bin/sh -c "env GTK_THEME=HighContrast G_ENABLE_DIAGNOSTIC=0 @libexecdir@/installed-tests/gtk+/gtk-reftest -k --verbose --tap --output $(pwd) --directory @libexecdir@/installed-tests/gtk+/reftests" -+Exec=/bin/sh -c "env GTK_THEME=HighContrast G_ENABLE_DIAGNOSTIC=0 @libexecdir@/installed-tests/gtk-4.0/gtk-reftest -k --verbose --tap --output $(pwd) --directory @libexecdir@/installed-tests/gtk-4.0/reftests" - Type=session-exclusive - Output=TAP -diff --git a/testsuite/reftests/reftests-hci.test.in b/testsuite/reftests/reftests-hci.test.in -index d08bb98..6ea0b1a 100644 ---- a/testsuite/reftests/reftests-hci.test.in -+++ b/testsuite/reftests/reftests-hci.test.in -@@ -1,4 +1,4 @@ - [Test] --Exec=/bin/sh -c "env GTK_THEME=HighContrastInverse G_ENABLE_DIAGNOSTIC=0 @libexecdir@/installed-tests/gtk+/gtk-reftest -k --verbose --tap --output $(pwd) --directory @libexecdir@/installed-tests/gtk+/reftests" -+Exec=/bin/sh -c "env GTK_THEME=HighContrastInverse G_ENABLE_DIAGNOSTIC=0 @libexecdir@/installed-tests/gtk-4.0/gtk-reftest -k --verbose --tap --output $(pwd) --directory @libexecdir@/installed-tests/gtk-4.0/reftests" - Type=session-exclusive - Output=TAP -diff --git a/testsuite/reftests/reftests.test.in b/testsuite/reftests/reftests.test.in -index 6b8a42f..9eb1864 100644 ---- a/testsuite/reftests/reftests.test.in -+++ b/testsuite/reftests/reftests.test.in -@@ -1,4 +1,4 @@ - [Test] --Exec=/bin/sh -c "env G_ENABLE_DIAGNOSTIC=0 @libexecdir@/installed-tests/gtk+/gtk-reftest -k --verbose --tap --output $(pwd) --directory @libexecdir@/installed-tests/gtk+/reftests" -+Exec=/bin/sh -c "env G_ENABLE_DIAGNOSTIC=0 @libexecdir@/installed-tests/gtk-4.0/gtk-reftest -k --verbose --tap --output $(pwd) --directory @libexecdir@/installed-tests/gtk-4.0/reftests" - Type=session-exclusive - Output=TAP diff --git a/debian/patches/series b/debian/patches/series index 6f63904dae..4eb58e1dc6 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1 @@ -reftests-Fix-path-to-installed-tests-in-.test-metadata.patch -testsuite-Install-accessibility-dump-executable-alongside.patch -testsuite-Make-installed-test-metadata-consistent-with-te.patch reftest-known-fail.patch diff --git a/debian/patches/testsuite-Install-accessibility-dump-executable-alongside.patch b/debian/patches/testsuite-Install-accessibility-dump-executable-alongside.patch deleted file mode 100644 index 68e53bb3c0..0000000000 --- a/debian/patches/testsuite-Install-accessibility-dump-executable-alongside.patch +++ /dev/null @@ -1,24 +0,0 @@ -From: Simon McVittie -Date: Fri, 14 Sep 2018 13:15:09 +0100 -Subject: testsuite: Install accessibility-dump executable alongside tests - -Signed-off-by: Simon McVittie -Forwarded: GNOME/gtk!348 -Applied-upstream: 3.94.1, commit:fa8190328d6596a7212de13f0639f26531097a62 ---- - testsuite/a11y/meson.build | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/testsuite/a11y/meson.build b/testsuite/a11y/meson.build -index ddd8f01..01fab47 100644 ---- a/testsuite/a11y/meson.build -+++ b/testsuite/a11y/meson.build -@@ -44,6 +44,8 @@ a11y_state_tests = [ - a11y_dump_bin = executable('accessibility-dump', - 'accessibility-dump.c', - dependencies: libgtk_dep, -+ install: get_option('install-tests'), -+ install_dir: testexecdir, - ) - - foreach t: a11y_state_tests diff --git a/debian/patches/testsuite-Make-installed-test-metadata-consistent-with-te.patch b/debian/patches/testsuite-Make-installed-test-metadata-consistent-with-te.patch deleted file mode 100644 index ba840da937..0000000000 --- a/debian/patches/testsuite-Make-installed-test-metadata-consistent-with-te.patch +++ /dev/null @@ -1,27 +0,0 @@ -From: Simon McVittie -Date: Wed, 19 Sep 2018 08:09:18 +0100 -Subject: testsuite: Make installed-test metadata consistent with test naming - -Signed-off-by: Simon McVittie -Forwarded: GNOME/gtk!348 -Applied-upstream: 3.94.1, commit:a0d83bdfa757c07ddf856e4199ff261a24463e80 ---- - testsuite/gtk/meson.build | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/testsuite/gtk/meson.build b/testsuite/gtk/meson.build -index d2febc4..ff0f85b 100644 ---- a/testsuite/gtk/meson.build -+++ b/testsuite/gtk/meson.build -@@ -110,9 +110,9 @@ if add_languages('cpp') - if get_option('install-tests') - conf = configuration_data() - conf.set('testexecdir', testexecdir) -- conf.set('test', 'keywords') -+ conf.set('test', 'autotestkeywords') - configure_file(input: 'gtk.test.in', -- output: 'keywords.test', -+ output: 'autotestkeywords.test', - configuration: conf, - install_dir: testdatadir) - endif -- 2.30.2